Let's try to work around this little issue